Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 19 Jan 2011 23:02:04 +0000 (15:02 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 19 Jan 2011 23:02:04 +0000 (15:02 -0800)
commit97b1e7637ded7a18645d716ee713bd4d62c7c280
tree3264720443bdb01117a41a0fb7c52641d868c4e5
parent08d5afcb10470605a4c36b6af84a33b1dcb9e53d
parenta91705288e9b7a1e57024dc21d27f06d4379a33e
Merge from mainline.